Merge "EditPage: switch from NS_CATEGORY check to instanceof CategoryPage"